summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.7.1-rc0v1.7.1-rc0Junio C Hamano2010-04-061-1/+15
* Merge branch 'da/maint-python-startup'Junio C Hamano2010-04-061-3/+2
|\
| * Makefile: Remove usage of deprecated Python "has_key" methodDavid Aguilar2010-03-281-3/+2
* | Merge branch 'ic/bash-completion-rpm'Junio C Hamano2010-04-061-0/+7
|\ \
| * | RPM spec: include bash completion supportIan Ward Comfort2010-03-291-0/+7
* | | Merge branch 'sb/fmt-merge-msg'Junio C Hamano2010-04-065-142/+235
|\ \ \
| * | | fmt-merge-msg: hide summary optionStephen Boyd2010-03-241-1/+3
| * | | fmt-merge-msg: remove custom string_list implementationStephen Boyd2010-03-241-83/+44
| * | | string-list: add unsorted_string_list_lookup()Stephen Boyd2010-03-243-5/+17
| * | | fmt-merge-msg: use pretty.c routinesStephen Boyd2010-03-241-21/+8
| * | | t6200: test fmt-merge-msg moreStephen Boyd2010-03-241-0/+115
| * | | t6200: modernize with test_tickStephen Boyd2010-03-241-35/+29
| * | | fmt-merge-msg: be quiet if nothing to mergeStephen Boyd2010-03-242-0/+22
* | | | Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-04-062-14/+33
|\ \ \ \
| * | | | diff --check: honor conflict-marker-size attributeJunio C Hamano2010-03-242-14/+33
* | | | | Merge branch 'ef/maint-empty-commit-log'Junio C Hamano2010-04-062-1/+13
|\ \ \ \ \
| * | | | | rev-list: fix --pretty=oneline with empty messageErik Faye-Lund2010-03-212-1/+13
* | | | | | Merge branch 'sg/bash-completion'Junio C Hamano2010-04-061-60/+34
|\ \ \ \ \ \
| * | | | | | bash: completion for gitk aliasesSZEDER Gábor2010-02-241-0/+9
| * | | | | | bash: support user-supplied completion scripts for aliasesSZEDER Gábor2010-02-241-4/+7
| * | | | | | bash: support user-supplied completion scripts for user's git commandsSZEDER Gábor2010-02-241-55/+12
| * | | | | | bash: improve aliased command recognitionSZEDER Gábor2010-02-241-3/+8
* | | | | | | Revert "Link against libiconv on IRIX"Junio C Hamano2010-04-051-2/+0
* | | | | | | Merge branch 'maint'Junio C Hamano2010-04-041-5/+5
|\ \ \ \ \ \ \
| * | | | | | | pack-protocol.txt: fix pkt-line lengthsTay Ray Chuan2010-04-041-4/+4
| * | | | | | | pack-protocol.txt: fix spellingTay Ray Chuan2010-04-041-1/+1
* | | | | | | | Merge branch 'mb/rebase-i-no-ff'Junio C Hamano2010-04-035-9/+152
|\ \ \ \ \ \ \ \
| * | | | | | | | Teach rebase the --no-ff option.Marc Branchaud2010-03-245-10/+152
* | | | | | | | | Merge branch 'sp/maint-http-backend-die-triggers-die-recursively'Junio C Hamano2010-04-031-7/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | http-backend: Don't infinite loop during die()Shawn O. Pearce2010-03-241-7/+11
* | | | | | | | | | Merge branch 'rr/imap-send-unconfuse-from-line'Junio C Hamano2010-04-032-8/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | imap-send: Remove limitation on message bodyRamkumar Ramachandra2010-03-242-8/+10
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'mg/use-default-abbrev-length-in-rev-list'Junio C Hamano2010-04-031-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rev-list: use default abbrev length when abbrev-commit is in effectMichael J Gruber2010-03-241-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'mg/maint-send-email-lazy-editor'Junio C Hamano2010-04-031-1/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | send-email: lazily assign editor variableMichael J Gruber2010-03-251-1/+4
* | | | | | | | | | | Merge branch 'rb/maint-python-path'Junio C Hamano2010-04-035-4/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Correct references to /usr/bin/python which does not exist on FreeBSDR. Tyler Ballance2010-03-245-4/+9
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jn/merge-diff3-label'Junio C Hamano2010-04-0315-79/+405
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | merge-recursive: add a label for ancestorJonathan Nieder2010-03-201-0/+1
| * | | | | | | | | | | cherry-pick, revert: add a label for ancestorJonathan Nieder2010-03-202-3/+6
| * | | | | | | | | | | revert: clarify label on conflict hunksJonathan Nieder2010-03-202-41/+64
| * | | | | | | | | | | compat: add mempcpy()Jonathan Nieder2010-03-201-0/+9
| * | | | | | | | | | | checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-202-1/+2
| * | | | | | | | | | | merge_trees(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-202-3/+9
| * | | | | | | | | | | merge_file(): add comment explaining behavior wrt conflict styleJonathan Nieder2010-03-201-0/+6
| * | | | | | | | | | | checkout --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-202-3/+3
| * | | | | | | | | | | ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-206-15/+17
| * | | | | | | | | | | merge-file --diff3: add a label for ancestorJonathan Nieder2010-03-202-2/+3
| * | | | | | | | | | | xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder2010-03-204-13/+20