Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | Merge branch 'rr/imap-send-unconfuse-from-line' into maint | Junio C Hamano | 2010-04-09 | 2 | -8/+10 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'rb/maint-python-path' into maint | Junio C Hamano | 2010-04-09 | 5 | -4/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'gh/maint-stash-show-error-message' into maint | Junio C Hamano | 2010-04-09 | 1 | -2/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/mailmap-update' into maint | Junio C Hamano | 2010-04-09 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/maint-daemon-sans-ss-family' into maint | Junio C Hamano | 2010-04-09 | 1 | -4/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | fetch/push: fix usage strings | Tay Ray Chuan | 2010-04-09 | 4 | -10/+10 | |
* | | | | | | | | | | | | | | | | Merge branch 'rc/maint-reflog-msg-for-forced-branch' | Junio C Hamano | 2010-04-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | branch: say "Reset to" in reflog entries for 'git branch -f' operations | Tay Ray Chuan | 2010-04-09 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | Merge early parts of jk/cached-textconv | Junio C Hamano | 2010-04-08 | 3 | -4/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | diff.c: work around pointer constness warnings | Junio C Hamano | 2010-04-08 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | fix textconv leak in emit_rewrite_diff | Jeff King | 2010-04-01 | 1 | -0/+4 | |
| * | | | | | | | | | | | | | | | | fix const-correctness of write_sha1_file | Jeff King | 2010-04-01 | 2 | -4/+4 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-04-08 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | docs: clarify "branch -l" | Jeff King | 2010-04-08 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | | Merge branch 'mg/notes-reflog' | Junio C Hamano | 2010-04-07 | 2 | -0/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | refs.c: Write reflogs for notes just like for branch heads | Michael J Gruber | 2010-03-29 | 2 | -1/+2 | |
| * | | | | | | | | | | | | | | | | t3301-notes: Test the creation of reflog entries | Michael J Gruber | 2010-03-29 | 1 | -0/+9 | |
* | | | | | | | | | | | | | | | | | Merge branch 'jn/mailinfo-scissors' | Junio C Hamano | 2010-04-07 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Teach mailinfo %< as an alternative scissors mark | Jonathan Nieder | 2010-04-04 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | | | | fix typos and grammar in 1.7.1 draft release notes | Jeff King | 2010-04-07 | 1 | -10/+10 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | notes.h: declare bit field as unsigned to silence compiler complaints | Brandon Casey | 2010-04-06 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | Git 1.7.1-rc0v1.7.1-rc0 | Junio C Hamano | 2010-04-06 | 1 | -1/+15 | |
* | | | | | | | | | | | | | | | | | Merge branch 'da/maint-python-startup' | Junio C Hamano | 2010-04-06 | 1 | -3/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Makefile: Remove usage of deprecated Python "has_key" method | David Aguilar | 2010-03-28 | 1 | -3/+2 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'ic/bash-completion-rpm' | Junio C Hamano | 2010-04-06 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | RPM spec: include bash completion support | Ian Ward Comfort | 2010-03-29 | 1 | -0/+7 | |
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'sb/fmt-merge-msg' | Junio C Hamano | 2010-04-06 | 5 | -142/+235 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | fmt-merge-msg: hide summary option | Stephen Boyd | 2010-03-24 | 1 | -1/+3 | |
| * | | | | | | | | | | | | | | | | | | fmt-merge-msg: remove custom string_list implementation | Stephen Boyd | 2010-03-24 | 1 | -83/+44 | |
| * | | | | | | | | | | | | | | | | | | string-list: add unsorted_string_list_lookup() | Stephen Boyd | 2010-03-24 | 3 | -5/+17 | |
| * | | | | | | | | | | | | | | | | | | fmt-merge-msg: use pretty.c routines | Stephen Boyd | 2010-03-24 | 1 | -21/+8 | |
| * | | | | | | | | | | | | | | | | | | t6200: test fmt-merge-msg more | Stephen Boyd | 2010-03-24 | 1 | -0/+115 | |
| * | | | | | | | | | | | | | | | | | | t6200: modernize with test_tick | Stephen Boyd | 2010-03-24 | 1 | -35/+29 | |
| * | | | | | | | | | | | | | | | | | | fmt-merge-msg: be quiet if nothing to merge | Stephen Boyd | 2010-03-24 | 2 | -0/+22 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/conflict-marker-size' | Junio C Hamano | 2010-04-06 | 2 | -14/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | diff --check: honor conflict-marker-size attribute | Junio C Hamano | 2010-03-24 | 2 | -14/+33 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'ef/maint-empty-commit-log' | Junio C Hamano | 2010-04-06 | 2 | -1/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | rev-list: fix --pretty=oneline with empty message | Erik Faye-Lund | 2010-03-21 | 2 | -1/+13 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'sg/bash-completion' | Junio C Hamano | 2010-04-06 | 1 | -60/+34 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | bash: completion for gitk aliases | SZEDER Gábor | 2010-02-24 | 1 | -0/+9 | |
| * | | | | | | | | | | | | | | | | | | | bash: support user-supplied completion scripts for aliases | SZEDER Gábor | 2010-02-24 | 1 | -4/+7 | |
| * | | | | | | | | | | | | | | | | | | | bash: support user-supplied completion scripts for user's git commands | SZEDER Gábor | 2010-02-24 | 1 | -55/+12 | |
| * | | | | | | | | | | | | | | | | | | | bash: improve aliased command recognition | SZEDER Gábor | 2010-02-24 | 1 | -3/+8 | |
* | | | | | | | | | | | | | | | | | | | | Revert "Link against libiconv on IRIX" | Junio C Hamano | 2010-04-05 | 1 | -2/+0 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-04-04 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | pack-protocol.txt: fix pkt-line lengths | Tay Ray Chuan | 2010-04-04 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | | | | | | pack-protocol.txt: fix spelling | Tay Ray Chuan | 2010-04-04 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'mb/rebase-i-no-ff' | Junio C Hamano | 2010-04-03 | 5 | -9/+152 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | Teach rebase the --no-ff option. | Marc Branchaud | 2010-03-24 | 5 | -10/+152 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' | Junio C Hamano | 2010-04-03 | 1 | -7/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | |