summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jl/maint-submodule-recurse-fetch' into maintJunio C Hamano2012-05-011-3/+3
|\
| * submodules: recursive fetch also checks new tags for submodule commitsJens Lehmann2012-04-141-3/+3
* | Merge branch 'jc/maint-blame-minimal' into maintJunio C Hamano2012-05-011-0/+1
|\ \
| * | blame: accept --need-minimalJunio C Hamano2012-04-111-0/+1
* | | Merge branch 'lp/maint-diff-three-dash-with-graph' into maintJunio C Hamano2012-05-013-2/+299
|\ \ \
| * | | t4202: add test for "log --graph --stat -p" separator lineslp/maint-diff-three-dash-with-graphLucian Poston2012-03-201-0/+290
| * | | log --graph: fix break in graph linesLucian Poston2012-03-201-0/+6
| * | | log --graph --stat: three-dash separator should come after graph linesLucian Poston2012-03-201-2/+3
* | | | Merge branch 'jk/rebase-i-submodule-conflict-only' into maintJunio C Hamano2012-05-012-1/+31
|\ \ \ \
| * | | | rebase -i continue: don't skip commits that only change submodulesJohn Keeping2012-04-092-1/+31
| | |/ / | |/| |
* | | | Merge branch 'maint' of https://github.com/git-l10n/git-poJunio C Hamano2012-05-016-282/+7605
|\ \ \ \
| * | | | l10n: Initial German translationRalf Thielow2012-05-011-717/+984
| * | | | l10n: Update Simplified Chinese translationJiang Xin2012-04-281-84/+100
| * | | | l10n: Update git.pot (2 new messages)Jiang Xin2012-04-281-83/+96
| * | | | Merge maint branch for tracking l10n updates of git stable versionJiang Xin2012-04-2840-213/+779
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Start preparing for 1.7.10.1Junio C Hamano2012-04-262-1/+51
* | | | | Merge branch 'jk/run-command-eacces' into maintJunio C Hamano2012-04-266-7/+86
|\ \ \ \ \
| * | | | | run-command: treat inaccessible directories as ENOENTJeff King2012-04-054-3/+80
| * | | | | compat/mingw.[ch]: Change return type of exec functions to intRamsay Jones2012-04-052-4/+6
* | | | | | Merge branch 'jc/push-upstream-sanity' into maintJunio C Hamano2012-04-262-8/+72
|\ \ \ \ \ \
| * | | | | | push: error out when the "upstream" semantics does not make senseJunio C Hamano2012-04-052-8/+72
* | | | | | | Merge branch 'jc/maint-clean-nested-worktree-in-subdir' into maintJunio C Hamano2012-04-262-11/+43
|\ \ \ \ \ \ \
| * | | | | | | clean: preserve nested git worktree in subdirectoriesjc/maint-clean-nested-worktree-in-subdirJunio C Hamano2012-03-152-11/+43
* | | | | | | | Merge branch 'jk/diff-no-rename-empty' into maintJunio C Hamano2012-04-269-14/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | merge-recursive: don't detect renames of empty filesjk/diff-no-rename-emptyJeff King2012-03-232-0/+17
| * | | | | | | | teach diffcore-rename to optionally ignore empty contentJeff King2012-03-233-1/+12
| * | | | | | | | make is_empty_blob_sha1 available everywhereJeff King2012-03-232-10/+13
| * | | | | | | | drop casts from users EMPTY_TREE_SHA1_BINJeff King2012-03-233-3/+3
* | | | | | | | | Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maintJunio C Hamano2012-04-261-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | combine-diff: fix loop index underflowrs/combine-diff-zero-context-at-the-beginningRené Scharfe2012-03-251-1/+1
* | | | | | | | | | Merge branch 'jc/commit-unedited-template' into maintJunio C Hamano2012-04-263-24/+65
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/git-commit: rephrase the "initial-ness" of templatesJunio C Hamano2012-04-031-5/+8
| * | | | | | | | | | git-commit.txt: clarify -t requires editing messageAdam Monsen2012-04-011-5/+5
| * | | | | | | | | | commit: rephrase the error when user did not touch templated log messageJunio C Hamano2012-03-302-19/+47
| * | | | | | | | | | commit: do not trigger bogus "has templated message edited" checkJunio C Hamano2012-03-302-0/+8
| * | | | | | | | | | t7501: test the right kind of breakageJunio C Hamano2012-03-301-0/+2
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/add-p-skip-conflicts' into maintJunio C Hamano2012-04-262-7/+44
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add--interactive: ignore unmerged entries in patch modeJeff King2012-04-052-7/+44
* | | | | | | | | | | Merge branch 'jc/commit-hook-authorship' into maintJunio C Hamano2012-04-265-47/+141
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | commit: pass author/committer info to hooksjc/commit-hook-authorshipJunio C Hamano2012-03-112-4/+20
| * | | | | | | | | | | t7503: does pre-commit-hook learn authorship?Junio C Hamano2012-03-111-0/+18
| * | | | | | | | | | | ident.c: add split_ident_line() to parse formatted ident lineJunio C Hamano2012-03-113-44/+104
* | | | | | | | | | | | Merge branch 'tr/maint-word-diff-regex-sticky' into maintJunio C Hamano2012-04-262-56/+102
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | diff: tweak a _copy_ of diff_options with word-difftr/maint-word-diff-regex-stickyThomas Rast2012-03-142-2/+5
| * | | | | | | | | | | | diff: refactor the word-diff setup from builtin_diff_cmdThomas Rast2012-03-141-56/+63
| * | | | | | | | | | | | t4034: diff.*.wordregex should not be "sticky" in --word-diffJohannes Sixt2012-03-141-0/+36
* | | | | | | | | | | | | Merge branch 'jh/notes-merge-in-git-dir-worktree' into maintJunio C Hamano2012-04-264-32/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdjh/notes-merge-in-git-dir-worktreeJohan Herland2012-03-152-8/+13
| * | | | | | | | | | | | | notes-merge: use opendir/readdir instead of using read_directory()Johan Herland2012-03-152-21/+31
| * | | | | | | | | | | | | t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/Johan Herland2012-03-151-0/+19
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
View Lorry Controller Status