Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/alias-in-bare' | Junio C Hamano | 2013-03-25 | 5 | -12/+53 |
|\ | |||||
| * | setup: suppress implicit "." work-tree for bare repos | Jeff King | 2013-03-08 | 5 | -0/+41 |
| * | environment: add GIT_PREFIX to local_repo_env | Jeff King | 2013-03-08 | 3 | -2/+4 |
| * | cache.h: drop LOCAL_REPO_ENV_SIZE | Jeff King | 2013-03-08 | 2 | -10/+8 |
* | | Merge branch 'jc/push-follow-tag' | Junio C Hamano | 2013-03-25 | 9 | -14/+218 |
|\ \ | |||||
| * | | push: --follow-tags | Junio C Hamano | 2013-03-05 | 7 | -2/+186 |
| * | | commit.c: use clear_commit_marks_many() in in_merge_bases_many() | Junio C Hamano | 2013-03-05 | 1 | -2/+1 |
| * | | commit.c: add in_merge_bases_many() | Junio C Hamano | 2013-03-05 | 2 | -6/+19 |
| * | | commit.c: add clear_commit_marks_many() | Junio C Hamano | 2013-03-05 | 2 | -6/+14 |
* | | | Merge branch 'jc/maint-reflog-expire-clean-mark-typofix' | Junio C Hamano | 2013-03-25 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | reflog: fix typo in "reflog expire" clean-up codepath | Junio C Hamano | 2013-03-05 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'ap/maint-diff-rename-avoid-overlap' | Junio C Hamano | 2013-03-25 | 2 | -1/+67 |
|\ \ \ | |||||
| * | | | tests: make sure rename pretty print works | Antoine Pelisse | 2013-03-06 | 1 | -0/+54 |
| * | | | diff: prevent pprint_rename from underrunning input | Thomas Rast | 2013-02-26 | 1 | -7/+10 |
| * | | | diff: Fix rename pretty-print when suffix and prefix overlap | Antoine Pelisse | 2013-02-23 | 1 | -1/+10 |
* | | | | Merge branch 'jl/submodule-deinit' | Junio C Hamano | 2013-03-25 | 5 | -3/+198 |
|\ \ \ \ | |||||
| * | | | | submodule: add 'deinit' command | Jens Lehmann | 2013-03-04 | 5 | -3/+198 |
* | | | | | Merge branch 'jc/describe' | Junio C Hamano | 2013-03-25 | 1 | -21/+20 |
|\ \ \ \ \ | |||||
| * | | | | | describe: --match=<pattern> must limit the refs even when used with --all | Junio C Hamano | 2013-02-28 | 1 | -21/+20 |
* | | | | | | Merge branch 'pe/pull-rebase-v-q' | Junio C Hamano | 2013-03-25 | 2 | -1/+28 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pull: Apply -q and -v options to rebase mode as well | Peter Eisentraut | 2013-03-16 | 2 | -1/+28 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-03-25 | 2 | -1/+31 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Start preparing for 1.8.2.1 | Junio C Hamano | 2013-03-25 | 2 | -1/+30 |
| * | | | | | | | Merge branch 'jk/graph-c-expose-symbols-for-cgit' into maint | Junio C Hamano | 2013-03-25 | 2 | -30/+35 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'maint-1.8.1' into maint | Junio C Hamano | 2013-03-25 | 10 | -23/+64 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'lf/bundle-verify-list-prereqs' into maint-1.8.1 | Junio C Hamano | 2013-03-25 | 1 | -5/+5 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'tk/doc-filter-branch' into maint-1.8.1 | Junio C Hamano | 2013-03-25 | 1 | -2/+25 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'dm/ni-maxhost-may-be-missing' into maint-1.8.1 | Junio C Hamano | 2013-03-25 | 2 | -4/+11 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'gp/describe-match-uses-glob-pattern' into maint-1.8.1 | Junio C Hamano | 2013-03-25 | 1 | -2/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/doc-index-format' into maint-1.8.1 | Junio C Hamano | 2013-03-25 | 3 | -5/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'wk/doc-pre-rebase' into maint-1.8.1 | Junio C Hamano | 2013-03-25 | 1 | -3/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/color-diff-doc' into maint-1.8.1 | Junio C Hamano | 2013-03-25 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | transport.c: help gcc 4.6.3 users by squelching compiler warning | Junio C Hamano | 2013-03-25 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.3 | Junio C Hamano | 2013-03-21 | 1 | -0/+76 |
* | | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2013-03-21 | 6 | -14/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | diff.c: diff.renamelimit => diff.renameLimit in message | Max Nanasy | 2013-03-21 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | wt-status: fix possible use of uninitialized variable | Jeff King | 2013-03-21 | 1 | -1/+4 |
| * | | | | | | | | | | | | | | | | fast-import: clarify "inline" logic in file_change_m | Jeff King | 2013-03-21 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | | | run-command: always set failed_errno in start_command | Jeff King | 2013-03-21 | 1 | -2/+3 |
| * | | | | | | | | | | | | | | | | transport: drop "int cmp = cmp" hack | Jeff King | 2013-03-21 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | drop some obsolete "x = x" compiler warning hacks | Jeff King | 2013-03-21 | 2 | -2/+2 |
| * | | | | | | | | | | | | | | | | fast-import: use pointer-to-pointer to keep list tail | Jeff King | 2013-03-21 | 1 | -6/+4 |
* | | | | | | | | | | | | | | | | | Merge branch 'we/submodule-update-prefix-output' | Junio C Hamano | 2013-03-21 | 2 | -14/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | submodule update: when using recursion, show full path | William Entriken | 2013-03-03 | 2 | -14/+20 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'jk/mailsplit-maildir-muttsort' | Junio C Hamano | 2013-03-21 | 1 | -0/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | mailsplit: sort maildir filenames more cleverly | Jeff King | 2013-03-02 | 1 | -0/+23 |
* | | | | | | | | | | | | | | | | | | Merge branch 'rs/zip-compresssed-size-with-export-subst' | Junio C Hamano | 2013-03-21 | 2 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | archive-zip: fix compressed size for stored export-subst files | René Scharfe | 2013-02-27 | 2 | -1/+7 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'mn/send-email-works-with-credential' | Junio C Hamano | 2013-03-21 | 3 | -51/+222 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | git-send-email: use git credential to obtain password | Michal Nazarewicz | 2013-02-27 | 2 | -30/+45 |